merge.
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Wed, 1 Feb 2006 20:15:08 +0000 (20:15 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Wed, 1 Feb 2006 20:15:08 +0000 (20:15 +0000)

Trivial merge